fix(merge): repair dev branch corruption in slippage/simulation files - #905
Closed
Ajibose wants to merge 1 commit into
Closed
fix(merge): repair dev branch corruption in slippage/simulation files#905Ajibose wants to merge 1 commit into
Ajibose wants to merge 1 commit into
Conversation
Merge commit e498adc concatenated two independent, unrelated implementations that landed under the same file paths instead of picking one — accesslayerorg#872 vs accesslayerorg#877 for slippageTolerance.utils.ts / SlippageToleranceSelector.tsx, and accesslayerorg#875 vs accesslayerorg#887 for KeySimulationTool.tsx. The result had duplicate/interleaved declarations and broken syntax, failing `tsc` outright. Restores each file to the version that's actually wired into the app (TradeDialog's value/onChange selector API and CreatorDetailPage's currentSupply/protocolFeeBps/creatorFeeBps props) and matches the surviving test files; the orphaned, never-integrated duplicate implementations are dropped. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01K2iSG6NcphR3o7H3FLGLYf
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
dev's merge commit e498adc concatenated two independent, unrelated implementations that both landed under the same file paths (Add slippage tolerance settings in the buy and sell modals wiring max_price and min_price to the contract call #872 vs Add unit tests for the slippage tolerance selector asserting correct max_price and min_price computation #877 forslippageTolerance.utils.ts/SlippageToleranceSelector.tsx, and Add a key simulation tool on the key detail page allowing users to model different buy scenarios #875 vs Add unit tests for the key simulation tool asserting price impact is computed and displayed correctly #887 forKeySimulationTool.tsx) instead of resolving the conflict. The result has duplicate/interleaved declarations and broken syntax —tsc -bfails outright on currentdev.TradeDialog'svalue/onChangeselector API (Add slippage tolerance settings in the buy and sell modals wiring max_price and min_price to the contract call #872) andCreatorDetailPage'scurrentSupply/protocolFeeBps/creatorFeeBpsprops (Add a key simulation tool on the key detail page allowing users to model different buy scenarios #875), matching the surviving test files. The orphaned, never-integrated duplicate implementations (Add unit tests for the slippage tolerance selector asserting correct max_price and min_price computation #877, Add unit tests for the key simulation tool asserting price impact is computed and displayed correctly #887) are dropped.Test plan
pnpm exec tsc -b --noEmitpasses clean (previously ~90 syntax errors)pnpm exec vitest runfor the touched files: 4 files / 49 tests passingpnpm exec eslint .— no new errors (1 pre-existing unrelated warning)🤖 Generated with Claude Code
https://claude.ai/code/session_01K2iSG6NcphR3o7H3FLGLYf